Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Latest Experimental Psychics #6

Merged
merged 97 commits into from
Jul 4, 2024

Conversation

VMSolidus
Copy link
Contributor

Description

This PR adds a Latest-Experimental version of Simple-Station/Einstein-Engines#391
Subtracting the breaking update that would have added an NPC Conversation System(Such code is not yet ready for playtesting, but will be ready PROBABLY by Saturday. Or next week, I can't really say. Anyway. This is a fucking massive update that makes psionics not suck. Have fun playtesting it.

VMSolidus and others added 26 commits July 1, 2024 19:40
We now have a glimmer system that can accommodate and account for lots of psychics with multiple powers.
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description
<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Self explanatory

P.S. i genuinely dont know what the fuck i did, who wrote this?

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [X] Fix shit

# Media

https://youtu.be/hbJbd5SgZ54

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- fix: Fixed loadouts becoming uneditable after spending all your points
This reverts commit 10803e1.
# Description
Cherry-picks DeltaV-Station/Delta-v#1194

This is a minor issue in the yml files of custom species that will
become a problem if we ever merge wizden's better hand indicators.

This PR shouldn't require a preview; all credit goes to the original
author of the fix.

---

# Changelog
Too minor for a cl. Or as some say, no cl no fun.

Co-authored-by: Angelo Fallaria <[email protected]>
# Description
Cherry-picks DeltaV-Station/Delta-v#1237

All credit goes to the original author, deltanedas

Adds a PDA app that lets seccies know who's wanted and who's about to be
thrown out of an airlock without relying on the sechud and people having
their IDs on them.

# Media


![image](https://github.com/Simple-Station/Einstein-Engines/assets/69920617/37f5fa1a-27a5-4392-b4bb-be0f1016b499)

(see the original PR for a better preview)

# Changelog

:cl: deltanedas
- add: Security can find the new SecWatch™ app in their PDAs to see
current suspects and wanted criminals.

Co-authored-by: deltanedas <[email protected]>
Co-authored-by: Azzy <[email protected]>
# Description
For some reason, ClothingSystem.TryEquip would return false if there's a
do-after to equip the clothing. This had caused all quick-equip attempts
on SMALL ITEMS to fail and ended up with every SMALL clothing item being
equipped into one of the pocket slots (which have no equip delays).

Also fixes quick swap - see the comments below.

# Changelog

:cl:
- fix: Equipping clothing using the Z key works correctly again.
…tor"

This reverts commit 8a0ee56, reversing
changes made to 8897a4b.
@Fansana Fansana merged commit febd6c7 into Fansana:master Jul 4, 2024
1 of 3 checks passed
Memeji pushed a commit that referenced this pull request Sep 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants